Skip to content

Fix required idtypes#970

Merged
TuThoThai merged 2 commits intonextfrom
fix_required_idtypes
Oct 15, 2025
Merged

Fix required idtypes#970
TuThoThai merged 2 commits intonextfrom
fix_required_idtypes

Conversation

@skinkie
Copy link
Copy Markdown
Contributor

@skinkie skinkie commented Oct 13, 2025

The following list is still a todo.

NOT Point
NOT GroupMember
NOT GroupConstraintMember
NOT Zone
NOT CommonSectionPointMember
NOT SectionInSequence
NOT SpatialFeature
NOT GeneralFrameMember
NOT Entity_Entity
NOT TypeOfEntity
NOT AddressablePlace
NOT SimpleAvailabilityCondition
NOT ActualVehicleEquipment
NOT TypeOfRollingStock
NOT PassengerAtStopTime
NOT DatedPassingTime
NOT LineSectionPointMember
NOT SiteStructure
NOT LevelInStructure
NOT TicketingEquipment
NOT TicketValidatorEquipment
NOT SignEquipment
NOT AlternativeQuayDescriptor
NOT CustomerService
NOT RechargingPointAssignment

Zone and Equipment changes cause failures maybe @ue71603 can help?

diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
index 97bb08a0..29bd1a98 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
@@ -93,10 +93,34 @@ Rail transport, Roads and Road transport
 		</xsd:complexContent>
 	</xsd:complexType>
 	<!-- ==== ZONE ===================================================== -->
-	<xsd:element name="Zone" type="Zone_VersionStructure" substitutionGroup="GroupOfEntities">
+	<xsd:element name="Zone" substitutionGroup="GroupOfEntities">
 		<xsd:annotation>
 			<xsd:documentation>A two-dimensional PLACE within the service area of a public transport operator (administrative zone, TARIFF ZONE, ACCESS ZONE, etc.).</xsd:documentation>
 		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="Zone_VersionStructure">
+					<xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="DataManagedObjectGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="GroupOfEntitiesGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="GroupOfPointsGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="ZoneGroup"/>
+						</xsd:sequence>
+					</xsd:sequence>
+					<xsd:attribute name="id" type="ZoneIdType" use="required"/>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
 	</xsd:element>
 	<xsd:complexType name="Zone_VersionStructure">
 		<xsd:annotation>

@skinkie
Initial implementation of required IdTypes.
dd152da 
This is the list of objects that now have an id type.
This list is also incomplete. All examples fixed.
@skinkie
Phase 2: restrict objects that did not have the restriction infrastru…
b797e7f 
…cture yet.
@skinkie skinkie self-assigned this Oct 13, 2025
@skinkie skinkie added the hygiene Technical dept, results in a breaking change. label Oct 13, 2025
@ue71603
Copy link
Copy Markdown
Contributor

ue71603 commented Oct 13, 2025

@skinkie where do you get an error. Obviousy lot in netex_zone_version.xsd (validates just fine with XMLSpy).

@skinkie
Copy link
Copy Markdown
Contributor Author

skinkie commented Oct 13, 2025

@skinkie where do you get an error. Obviousy lot in netex_zone_version.xsd (validates just fine with XMLSpy).

When you apply the 'patch' I get errors that the subsitution group does not match anymore.

@skinkie skinkie marked this pull request as ready for review October 13, 2025 22:49
@skinkie
Copy link
Copy Markdown
Contributor Author

skinkie commented Oct 13, 2025

I am happy to leave it at this. Please review.

@skinkie
Copy link
Copy Markdown
Contributor Author

skinkie commented Oct 14, 2025

At this point we have introduced restrictions. It seems on many points (if not all) they do not inherit all attributes from higher levels. Most of them do inherit all elements. Opened an issue: #973

@skinkie skinkie mentioned this pull request Oct 14, 2025
Merged
@ue71603 ue71603 requested a review from trurlurl October 14, 2025 13:23
@ue71603 ue71603 added this to the netex_2.0 milestone Oct 14, 2025
@skinkie
Copy link
Copy Markdown
Contributor Author

skinkie commented Oct 14, 2025

Thanks @ue71603 and @trurlurl I'll wait for at least one other French speaking person.

@thbar
Copy link
Copy Markdown
Contributor

thbar commented Oct 15, 2025

Our review on this one will be finalized this afternoon.

thbar
thbar approved these changes Oct 15, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@thbar thbar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me; here are my notes + the tooling I used to review more efficiently.

  • Proposed PR title: “Make @id required with specific *IdType across schemas; update examples to conform” - does that match the content in your opinion @skinkie?
  • Overall these are breaking changes (as discussed), we’ll want to advertise these as such (here in the description and/or in the release notes).
  • It is possible that I have missed a few important points; as mentioned before, before release #963 I'll do a bit of real-file testing, this may pop up after.
  • Question @skinkie : was AI used to generate the code (or some part of it)? I am leaning toward explicit mentions of this when used, to set correct review assumptions.
  • Long term consideration: function examples are moving away a bit further from actual production examples, but still keep real-life names; we’ll have to make sure this doesn’t confuse people (related: https://3.basecamp.com/3256016/buckets/2570434/messages/9143338449Notes)
  • FWIW, rendering of large PR diffs is painfully slow on Safari at the moment (The Github website is extremely slow on Safari · community · Discussion #170758)

What has been touched, bird view

❯ git diff --dirstat=lines origin/next...HEAD   
  18.2% examples/functions/stopPlace/
   3.1% examples/functions/
   3.3% examples/standards/tap_tsi/
   6.6% examples/standards/
  22.8% scripts/
   3.0% xsd/netex_framework/netex_genericFramework/
  10.7% xsd/netex_framework/netex_reusableComponents/
   5.1% xsd/netex_part_1/part1_ifopt/
   3.4% xsd/netex_part_1/part1_tacticalPlanning/
   3.7% xsd/netex_part_2/
   9.0% xsd/netex_part_3/part3_fares/
   3.2% xsd/netex_part_3/
   7.3% xsd/

How to review (out of the browser)

git diff origin/next...HEAD --color | less -R

Useful shortcuts:

  • G then g then = -> show up how far (percent) you are on the total length of the diff
  • Go forward one page or backward one page

Viewing changes of the XML files only, focused mode

git diff origin/next...HEAD -U0 --no-prefix -- . ':!*.py' ':!*.xsd' | grep '^[+]' | grep -v '^+++' | grep -v '^---' | sort | uniq -c

This shows only the additions, without the context, so the result is overall fairly short to parse compared to the whole diff in GitHub.

Click me 
❯ git diff origin/next...HEAD -U0 --no-prefix -- . ':!*.py' ':!*.xsd' | grep '^[+]' | grep -v '^+++' | grep -v '^---' | sort | uniq -c
   1 +             <AccessibilityLimitation id="dd@deck_1@seating" version="any">
   1 +             <AccessibilityLimitation id="dd@deck_2@seating" version="any">
   1 +             <AccessibilityLimitation id="mb:AA-ddb_deck_1@seating" version="any">
   1 +             <AccessibilityLimitation id="mb:AA-ddb_deck_2@seating" version="any">
   1 +             <AccessibilityLimitation id="rc:AA-slw_deck_1@compartment_1" version="any">
   1 +             <AccessibilityLimitation id="rc:AA-slw_deck_1@compartment_2" version="any">
   1 +            <GenericParameterAssignmentInContext id="1">
   1 +            <GenericParameterAssignmentInContext id="2">
   1 +            <GenericParameterAssignmentInContext id="3">
   1 +            <GenericParameterAssignmentInContext id="4">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_E1_ACAS1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_E1acc_ACAS1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_E2_ACAS1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_E3_ACAS1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_E4_ACAS1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_E5_ACAS1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.10i_OPK-E1_to_V10-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.10o_OPK-E1_to_V10-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.11i_OPK-E1_to_V11-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.11o_OPK-E1_to_V11-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.1i_OPK-E1_to_V1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.1o_OPK-E1_to_V1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.2i_OPK-E1_to_V2-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.2o_OPK-E1_to_V2-E1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.3i_OPK-E1_to_V3-E1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.3o_OPK-E1_to_V3-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.4i_OPK-E1_to_V4-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.4o_OPK-E1_to_V4-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.5i_OPK-E1_to_V5-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.5o_OPK-E1_to_V5-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.6i_OPK-E1_to_V6-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.6o_OPK-E1_to_V6-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.7i_OPK-E1_to_V7-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.7o_OPK-E1_to_V7-E1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.8i_OPK-E1_to_V8-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.8o_V8-E1_to_OPK-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.9i_OPK-E1_to_V9-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_N3.9o_OPK-E1_to_V9-E1_ac1" version="any">
   1 +           <AccessibilityLimitation id="naptPoi:8100OPK_fully_accessible" version="any">
   1 +           <AccessibilityLimitation id="naptStop:8220DB007590" version="11">
   1 +           <AccessibilityLimitation id="naptStop:910GSTRFD_to_8100OPK-E1-acc_01" version="any">
   1 +           <AccessibilityLimitation id="naptStop:940GZZCRSTD_to_8100OPK-E1-acc_01" version="any">
   1 +           <AccessibilityLimitation id="naptStop:940GZZLUSTD_to_8100OPK-E1-acc_01" version="any">
   1 +           <AccessibilityLimitation id="naptStop:940GZZLUWHM_to_8100OPK-E1-acc_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_A1" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_A1-EE1" version="any">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_A2" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_A4" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_A5" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_FC" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_L1" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_L2" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_L3" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_L4" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_S1" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_S2" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_S3" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_S4" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A1-EE1_A1-EI1" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2-ES1g_S1-J1_by-S1" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2-ES2g_5n6-ES1pl_by-S2" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2-ES3g_7n8-ES1pl_by-S3" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2-ES4g_9n10-ES1pl_by-S4" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2b-EL1g_A5-EL1pl_by-L1" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2b-EL2g_5n6-EL1pl_by-L2" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2b-EL3g_7n8-EL1pl_by-L3" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A2b-EL4g_9n10-EL1pl_by-L4" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_A4-EE1_A4-EI3" version="001">
   1 +           <AccessibilityLimitation id="nptg:9100WIMBLDN_lnk_S1-J1_A5-ES1pl_by-S1" version="001">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to00_both_02" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to01_both_N01_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to02_both_N01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to03_both" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to04_both" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to05_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to06_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_01to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to00_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to02_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to03_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to04_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to05_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to06_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_02to07_both" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_03to00_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_03to04_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_03to05_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_03to06_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_03to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_04to00_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_04to04_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_04to05_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_04to06_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_04to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_05to00_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_05to06_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_05to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_06to00_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_06to06_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_06to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_07to00_both_01" version="any">
   1 +           <AccessibilityLimitation id="nptg:wimcon_07to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="tbd:8100OPK-E1_to_910GSTRFD-acc_01" version="any">
   1 +           <AccessibilityLimitation id="tbd:8100OPK-E1_to_940GZZCRSTD-acc_01" version="any">
   1 +           <AccessibilityLimitation id="tbd:8100OPK-E1_to_940GZZLUWHM-acc_01" version="any">
   1 +           <AccessibilityLimitation id="tbd:8100OPK-E1_to_GZZLUSTD_ac1" version="any">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@A1" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@A1-EE1" version="any">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@A2" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@A4" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@A5" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@FC" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@L1" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@L2" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@L3" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@L4" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@S1" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@S2" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@S3" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@S4" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A1-EE1_A1-EI1" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2-ES1g_S1-J1_by-S1" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2-ES2g_5n6-ES1pl_by-S2" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2-ES3g_7n8-ES1pl_by-S3" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2-ES4g_9n10-ES1pl_by-S4" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2b-EL1g_A5-EL1pl_by-L1" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2b-EL2g_5n6-EL1pl_by-L2" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2b-EL3g_7n8-EL1pl_by-L3" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A2b-EL4g_9n10-EL1pl_by-L4" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_A4-EE1_A4-EI3" version="001">
   2 +           <AccessibilityLimitation id="tbd:9100WIMBLDN@link_S1-J1_A5-ES1pl_by-S1" version="001">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to00_both_02" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to01_both_N01_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to02_both_N01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to03_both" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to04_both" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to05_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to06_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_01to07_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to00_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to02_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to03_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to04_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to05_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to06_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_02to07_both" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_03to00_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_03to04_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_03to05_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_03to06_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_03to07_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_04to00_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_04to04_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_04to05_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_04to06_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_04to07_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_05to00_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_05to06_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_05to07_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_06to00_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_06to06_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_06to07_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_07to00_both_01" version="any">
   2 +           <AccessibilityLimitation id="tbd:wimcon_07to07_both_01" version="any">
   1 +           <AccessibilityLimitation id="xx:AA-station_765@entrance_1" version="any">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:490G00272P_ST-StopD_to_5n6" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:490G00272P_ST-StopD_to_DL_is-branched" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:490G00272P_ST-StopL_to_9n10" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_5n6_to_7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_5n6_to_9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_5n6_to_A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_7n8_to_5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_7n8_to_9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_7n8_to_A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_7n8_to_DL-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_9n10_to_5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_9n10_to_7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_9n10_to_A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_A1-EE1_to_5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_A1-EE1_to_7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_A1-EE1_to_9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_A1-EE1_to_DL_is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_A1-EE1_to_DL_is-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_DL-acc-to-EI1_is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_DL_to_7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_DL_to_A1-EE1-is-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" id="nptg:9100WIMBLDN_DL_to_Q1-Q2-is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:490G00272P@ST-StopD+5n6" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:490G00272P@ST-StopD+DL_is-branched" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:490G00272P@ST-StopL+9n10" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@5n6+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@5n6+9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@5n6+A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@7n8+5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@7n8+9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@7n8+A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@7n8+DL-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@9n10+5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@9n10+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@9n10+A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@A1-EE1+5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@A1-EE1+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@A1-EE1+9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@A1-EE1+DL_is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@A1-EE1+DL_is-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@DL+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@DL+A1-EE1-is-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@DL+Q1-Q2-is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" id="tbd:9100WIMBLDN@DL-acc-to-EI1_is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:490G00272P@ST-StopD+5n6" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:490G00272P@ST-StopD+DL_is-branched" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:490G00272P@ST-StopL+9n10" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@5n6+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@5n6+9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@5n6+A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@7n8+5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@7n8+9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@7n8+A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@7n8+DL-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@9n10+5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@9n10+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@9n10+A1-EE1-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@A1-EE1+5n6-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@A1-EE1+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@A1-EE1+9n10-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@A1-EE1+DL_is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@A1-EE1+DL_is-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@DL+7n8-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@DL+A1-EE1-is-notacc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@DL+Q1-Q2-is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@DL-acc-to-EI1_is-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:490000272C" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:490014734B" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:490015472D" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:490015472L" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:4900ZZLUWIM1n2" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:4900ZZLUWIM3n4" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_5n6" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_5n6_to_7n8-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_5n6_to_9n10-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_5n6to_A1-EE1-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_7n8" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_7n8_to_9n10-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_7n8to_5n6-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_7n8to_A1-EE1-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_7n8to_DL-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_9n10" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_9n10to_5n6-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_9n10to_7n8-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_9n10to_A1-EE1-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_A1-EE1_to_5n6-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_A1-EE1_to_7n8-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_A1-EE1_to_9n10-acc" version="001">
   1 +           <AccessibilityLimitation modification="new" id="nptg:9100WIMBLDN_DL_to_7n8-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:490000272C" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:490014734B" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:490015472D" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:490015472L" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:4900ZZLUWIM1n2" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:4900ZZLUWIM3n4" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@5n6" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@5n6+7n8-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@5n6+9n10-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@5n6to_A1-EE1-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@7n8" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@7n8+9n10-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@7n8to_5n6-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@7n8to_A1-EE1-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@7n8to_DL-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@9n10" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@9n10to_5n6-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@9n10to_7n8-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@9n10to_A1-EE1-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@A1-EE1+5n6-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@A1-EE1+7n8-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@A1-EE1+9n10-acc" version="001">
   2 +           <AccessibilityLimitation modification="new" id="tbd:9100WIMBLDN@DL+7n8-acc" version="001">
   1 +           <AccessibilityLimitation version="01" created="2010-05-17T09:30:47Z" id="ztb:bh0023@A1">
   1 +           <AccessibilityLimitation version="01" created="2010-05-17T09:30:47Z" id="ztb:bh0023@A2">
   1 +           <AccessibilityLimitation version="01" created="2010-05-17T09:30:47Z" id="ztb:bh0023@AX3">
   1 +         <AccessibilityLimitation created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="naptStop:910GSTRFD" version="any">
   1 +         <AccessibilityLimitation created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="naptStop:940GZZCRSTD" version="any">
   1 +         <AccessibilityLimitation created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="naptStop:940GZZLUSTD" version="any">
   1 +         <AccessibilityLimitation created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="naptStop:940GZZLUWHM" version="any">
   1 +         <AccessibilityLimitation id="NHR:AccessibilityAssessment:3" version="any">
   1 +         <AccessibilityLimitation id="NHR:AccessibilityAssessment:4" version="any">
   1 +         <AccessibilityLimitation id="NHR:AccessibilityAssessment:5" version="any">
   1 +         <AccessibilityLimitation id="NHR:AccessibilityAssessment:6" version="any">
   2 +         <AccessibilityLimitation id="NSR:AccessibilityAssessment:1" version="any">
   1 +         <AccessibilityLimitation id="acs:ACS@Accessibility:24" version="any">
   1 +         <AccessibilityLimitation id="acs:ACS@Accessibility:25" version="any">
   1 +         <AccessibilityLimitation id="ch:1:AccessibilityAssessment:8509000:P1" version="any">
   1 +         <AccessibilityLimitation id="mybus:0066" version="any">
   1 +         <AccessibilityLimitation id="mybus:SP_0751A" version="any">
   1 +         <AccessibilityLimitation id="mybus:SSP_02456A" version="any">
   1 +         <AccessibilityLimitation id="naptPoi:8100OPK_ACID_21" version="any">
   1 +         <AccessibilityLimitation id="naptStop:9100ASHFKY" version="any">
   1 +         <AccessibilityLimitation id="naptStop:9100EBSFDOM" version="any">
   2 +         <AccessibilityLimitation id="uic2:008600683" version="any">
   1 +         <AccessibilityLimitation id="uic:007300101" version="any">
   2 +         <AccessibilityLimitation id="uic:008301700" version="any">
   2 +         <AccessibilityLimitation id="uic:008600683" version="any">
   1 +         <AccessibilityLimitation id="ztb:bh0023" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" changed="2010-05-17T09:30:47Z" id="nptg:910GWIMBLDN_Ac1" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" changed="2010-05-17T09:30:47Z" id="nptg:940GZZCRWIM" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="nptg:Xtra_accessibility_data" changed="2010-05-17T09:30:47Z" id="nptg:940GZZLUWIM" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="tbd:910GWIMBLDN_Ac1" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="tbd:940GZZCRWIM" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="tbd:XtraAccessibilityData" changed="2010-05-17T09:30:47Z" id="tbd:940GZZLUWIM" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" changed="2010-05-17T09:30:47Z" id="tbd:910GWIMBLDN_Ac1" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" changed="2010-05-17T09:30:47Z" id="tbd:940GZZCRWIM" version="any">
   1 +         <AccessibilityLimitation modification="new" dataSourceRef="tbd:accessibility_data" changed="2010-05-17T09:30:47Z" id="tbd:940GZZLUWIM" version="any">
   1 +         <VariantText lang="de">Gültig für passholders</VariantText>
   1 +        <DeliveryVariant id="1">
   2 +        <DeliveryVariant id="1010-1" order="1">
   2 +        <DeliveryVariant id="1010-2" order="2">
   2 +        <DeliveryVariant id="1010-3" order="3">
   2 +        <DeliveryVariant id="1111-1" order="1">
   2 +        <DeliveryVariant id="1111-2" order="2">
   2 +        <DeliveryVariant id="1111-3" order="3">
   1 +        <DeliveryVariant id="2">
   1 +        <DeliveryVariant id="3">
   1 +        <DeliveryVariant id="4">
   2 +        <DeliveryVariant id="5001-1" order="1">
   2 +        <DeliveryVariant id="5001-2" order="2">
   2 +        <DeliveryVariant id="5001-3" order="3">
   2 +        <DeliveryVariant id="9001-1" order="1">
   2 +        <DeliveryVariant id="9001-2" order="2">
   2 +        <DeliveryVariant id="9001-3" order="3">
   2 +        <DeliveryVariant id="9002-1" order="1">
   2 +        <DeliveryVariant id="9002-2" order="2">
   2 +        <DeliveryVariant id="9002-3" order="3">
   2 +        <DeliveryVariant id="9003-1" order="1">
   2 +        <DeliveryVariant id="9003-2" order="2">
   2 +        <DeliveryVariant id="9003-3" order="3">
   1 +        <DeliveryVariant id="ELI:50-1" order="1">
   1 +        <DeliveryVariant id="ELI:50-2" order="2">
   1 +        <DeliveryVariant id="ELI:50-3" order="3">
   1 +        <DeliveryVariant id="ELI:50-4" order="4">
   1 +        <DeliveryVariant id="ELI:51-1" order="1">
   1 +        <DeliveryVariant id="ELI:51-2" order="2">
   1 +        <DeliveryVariant id="ELI:51-3" order="3">
   1 +        <DeliveryVariant id="ELI:51-4" order="4">
   1 +        <DeliveryVariant id="ELI:99-1" order="1">
   1 +        <DeliveryVariant id="ELI:99-2" order="2">
   1 +        <DeliveryVariant id="ELI:99-3" order="3">
   1 +        <DeliveryVariant id="ELI:99-4" order="4">
   1 +        <DestinationDisplayVariant id="mybus:Bravo-tts" version="any">
   1 +        <VehicleTypeZoneRestriction id="1">
   1 +        <VehicleTypeZoneRestriction id="2">
   1 +        <VehicleTypeZoneRestriction id="3">
   1 +        <VehicleTypeZoneRestriction id="4">
   1 +        <VehicleTypeZoneRestriction id="5">
   1 +        <VehicleTypeZoneRestriction id="6">
   2 +       <AccessibilityLimitation id="NSR:AccessibilityAssessment:1" version="any">
   1 +       <AccessibilityLimitation id="mypark:PP01" version="any">
   1 +      <CycleStorageEquipment id="1">
   1 +      <InterchangeRuleTiming id="IR_33" version="1">
   1 +      <InterchangeRuleTiming id="IR_34" version="1">
   1 +      <InterchangeRuleTiming id="IR_41" version="1">
   1 +      <InterchangeRuleTiming id="IR_42" version="1">
   1 +      <InterchangeRuleTiming id="IR_43" version="1">
   1 +      <InterchangeRuleTiming id="IR_44" version="1">
   1 +      <InterchangeRuleTiming id="IR_58" version="1">
   1 +      <InterchangeRuleTiming id="IR_60" version="1">
   1 +      <InterchangeRuleTiming id="IR_61" version="1">
   1 +      <InterchangeRuleTiming id="IR_62" version="1">
   1 +      <InterchangeRuleTiming id="IR_63" version="1">
   1 +      <InterchangeRuleTiming id="IR_64" version="1">
   1 +      <InterchangeRuleTiming id="IR_65" version="1">
   1 +      <InterchangeRuleTiming id="IR_67" version="1">
   1 +      <InterchangeRuleTiming id="IR_68" version="1">
   1 +      <InterchangeRuleTiming id="IR_71" version="1">
   1 +      <VehicleJourneyRunTime id="DR_131770623" version="1">
   1 +      <VehicleJourneyRunTime id="DR_131770626" version="1">
   1 +      <VehicleJourneyRunTime id="DR_32715223" version="1">
   1 +      <VehicleJourneyRunTime id="DR_33864223" version="1">
   1 +      <VehicleJourneyRunTime id="DR_401370623" version="1">
   1 +      <VehicleJourneyRunTime id="DR_401370624" version="1">
   1 +      <VehicleJourneyRunTime id="DR_401370626" version="1">
   1 +      <VehicleJourneyRunTime id="DR_40147923" version="1">
   1 +      <VehicleJourneyRunTime id="DR_40147924" version="1">
   1 +      <VehicleJourneyRunTime id="DR_45014423" version="1">
   1 +      <VehicleJourneyRunTime id="DR_45614223" version="1">
   1 +      <VehicleJourneyRunTime id="DR_643555323" version="1">
   1 +      <VehicleJourneyRunTime id="DR_6707723" version="1">
   1 +      <VehicleJourneyRunTime id="DR_68067423" version="1">
   1 +      <VehicleJourneyRunTime id="DR_7111511423" version="1">
   1 +      <VehicleJourneyRunTime id="DR_7237562523" version="1">
   1 +      <VehicleJourneyRunTime id="DR_7831543323" version="1">
   1 +      <VehicleJourneyRunTime id="DR_7887555123" version="1">
   1 +      <VehicleJourneyRunTime id="DR_7961554423" version="1">
   1 +      <VehicleJourneyRunTime id="DR_796410123" version="1">
   1 +      <VehicleJourneyRunTime id="DR_7977555223" version="1">
   1 +      <VehicleJourneyRunTime id="DR_827323" version="1">
   1 +      <VehicleJourneyRunTime id="DR_87418123" version="1">
   1 +      <VehicleJourneyRunTime id="DR_91510123" version="1">
   1 +      <VehicleJourneyRunTime id="DR_91513723" version="1">
   1 +      <VehicleJourneyRunTime id="DR_91514323" version="1">
   1 +      <VehicleJourneyRunTime id="DR_915234423" version="1">
   1 +      <VehicleJourneyRunTime id="DR_915237623" version="1">
   1 +      <VehicleJourneyRunTime id="DR_915538023" version="1">
   1 +      <VehicleJourneyRunTime id="DR_9157823" version="1">
   1 +      <VehicleJourneyRunTime id="DR_959538023" version="1">
   1 +      <VehicleJourneyRunTime id="DR_963234423" version="1">
   1 +      <VehicleJourneyRunTime id="DR_97314323" version="1">
   1 +      <VehicleJourneyRunTime id="DR_97413723" version="1">
   1 +      <VehicleJourneyRunTime id="DR_990237623" version="1">
   1 +      <VehicleJourneyRunTime id="DR_9927823" version="1">
   1 +     <AccessibilityLimitation id="1:1">
   1 +     <AccessibilityLimitation id="2:1">
   1 +    <EquipmentPlace id="1">
   1 +    <MeetingPointService id="1">
   1 +    <TicketingEquipment id="1">
   1 +   <AccessibilityAssessment id="1:1">
   1 +   <AccessibilityAssessment id="2:1">
   2 +   <AccessibilityLimitation id="1">
   1 +   <RoadAddress id="1">
   1 +   <Suitability id="1">
   1 +   <Suitability id="2">
   1 +   <TrainElement id="1" version="any">
   1 +  <AccessSpace id="1">
   1 +  <Accommodation id="1">
   1 +  <DayType id="1" version="any">
   1 +  <DayType id="2" version="any">
   1 +  <DestinationDisplayVariant id="1">
   1 +  <Level id="1">
   1 +  <Level id="2">
   1 +  <LinkProjection id="1">
   1 +  <OnboardStay id="1">
   1 +  <OperatingDay id="1">
   1 +  <OperatingDay id="2">
   1 +  <OperatingDay id="3">
   1 +  <PlaceLighting id="1">
   1 +  <PointProjection id="1">
   1 +  <RoughSurface id="1">
   1 +  <StopPlaceEntrance id="1">
   1 +  <TrainComponent id="1" version="any">
   1 +  <TrainInCompoundTrain id="1">
   1 +  <TrainInCompoundTrain id="2">
   2 + <AccessibilityAssessment id="1">
   2 +<AvailabilityCondition xmlns:siri="http://www.siri.org.uk/siri" xmlns="http://www.netex.org.uk/netex" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd">
   1 +<CompoundTrain xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd">
   1 +<DestinationDisplay xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd">
   1 +<GeneralZone xmlns="http://www.netex.org.uk/netex" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd">
   1 +<OffSitePathLink xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd">
   1 +<Point xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd">
   1 +<ServiceFacilitySet xmlns="http://www.netex.org.uk/netex" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd">
   1 +<StopPlace xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd">
   1 +<Train xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="1" version="any" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../../xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd">

TuThoThai
TuThoThai approved these changes Oct 15, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@TuThoThai TuThoThai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve with the highlight that, in the future, PRs with breaking changes shold be better documented and maybe broken into smaller pieces to ease the review (though on the same theme).
If not, it will become harder to embark the extended community of NeTEx.

@TuThoThai TuThoThai merged commit 8f86d3b into next Oct 15, 2025
1 check passed
@TuThoThai TuThoThai mentioned this pull request Oct 15, 2025
Closed
21 tasks
@skinkie
Copy link
Copy Markdown
Contributor Author

skinkie commented Oct 15, 2025

  • Question @skinkie : was AI used to generate the code (or some part of it)? I am leaning toward explicit mentions of this when used, to set correct review assumptions.

Yes, some boiler plates were LLM generated, sadly it is not yet powerfull enough to do what is intended. Hence many parts of the XSD validator was LLM generated, but once we got into groups, it all broke down again. Hence my job is still required.

Some tooling was created to do efficient updates, but virtually all errors were fixed by hand.

@skinkie skinkie deleted the fix_required_idtypes branch October 15, 2025 13:12
@TuThoThai TuThoThai mentioned this pull request Oct 23, 2025
Merged
@TuThoThai TuThoThai mentioned this pull request Nov 19, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thbar thbar thbar approved these changes

@ue71603 ue71603 ue71603 approved these changes

@TuThoThai TuThoThai TuThoThai approved these changes

@trurlurl trurlurl trurlurl approved these changes

@Aurige Aurige Awaiting requested review from Aurige

Assignees

@skinkie skinkie

Labels

hygiene Technical dept, results in a breaking change. needs wiki update

Projects

None yet

Milestone

netex_2.0

Development

Successfully merging this pull request may close these issues.

5 participants

@skinkie @ue71603 @thbar @TuThoThai @trurlurl